From 961b7a9210ddee7765888c2b96b06b90876266d5 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 12 Sep 2014 18:01:58 +0200 Subject: [PATCH] Adwaita: theme active-menu buttons --- gtk/resources/theme/Adwaita/_common.scss | 2 +- gtk/resources/theme/Adwaita/gtk-contained-dark.css | 6 +++--- gtk/resources/theme/Adwaita/gtk-contained.css | 6 +++--- gtk/resources/theme/Adwaita/parse-sass.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 9bc7656b02..4a307bd3e4 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -338,7 +338,7 @@ $_dot_color: if($variant=='light', $selected_bg_color, @include button(hover); -gtk-image-effect: highlight; } - &:active, &:checked { + &:active, &:checked, &.active-menu { @include button(active); transition-duration: 50ms; } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 05748a51fb..a6696b15ed 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -307,7 +307,9 @@ GtkCalendar.header .button.titlebutton { .titlebar .button.titlebutton:active, GtkCalendar.header .button.titlebutton:active, .button:checked, .header-bar .button.titlebutton:checked, .titlebar .button.titlebutton:checked, - GtkCalendar.header .button.titlebutton:checked { + GtkCalendar.header .button.titlebutton:checked, .button.active-menu, .header-bar .active-menu.button.titlebutton, + .titlebar .active-menu.button.titlebutton, + GtkCalendar.header .active-menu.button.titlebutton { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1c1f1f; @@ -4167,5 +4169,3 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected { @define-color wm_button_active_color_b shade(#393f3f, 0.89); @define-color wm_button_active_color_c shade(#393f3f, 0.9); @define-color content_view_bg #292929; - -/*# sourceMappingURL=gtk-contained-dark.css.map */ diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 75dec98fbd..d9224ae049 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -299,7 +299,9 @@ GtkCalendar.header .button.titlebutton { .titlebar .button.titlebutton:active, GtkCalendar.header .button.titlebutton:active, .button:checked, .header-bar .button.titlebutton:checked, .titlebar .button.titlebutton:checked, - GtkCalendar.header .button.titlebutton:checked { + GtkCalendar.header .button.titlebutton:checked, .button.active-menu, .header-bar .active-menu.button.titlebutton, + .titlebar .active-menu.button.titlebutton, + GtkCalendar.header .active-menu.button.titlebutton { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #a1a1a1; @@ -4326,5 +4328,3 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected { @define-color wm_button_active_color_b shade(#ededed, 0.89); @define-color wm_button_active_color_c shade(#ededed, 0.9); @define-color content_view_bg #ffffff; - -/*# sourceMappingURL=gtk-contained.css.map */ diff --git a/gtk/resources/theme/Adwaita/parse-sass.sh b/gtk/resources/theme/Adwaita/parse-sass.sh index 2486480802..333bbc5c63 100755 --- a/gtk/resources/theme/Adwaita/parse-sass.sh +++ b/gtk/resources/theme/Adwaita/parse-sass.sh @@ -1,3 +1,3 @@ #!/usr/bin/bash -sass --update . +sass --update --sourcemap=none . -- 2.30.2